diff --git a/core/c/libc/math.odin b/core/c/libc/math.odin
index 1ffd21500..c1c51fa25 100644
--- a/core/c/libc/math.odin
+++ b/core/c/libc/math.odin
@@ -182,18 +182,20 @@ FP_SUBNORMAL     :: 4
 @(private)
 _fpclassify :: #force_inline proc(x: double) -> int {
 	u := transmute(uint64_t)x
-	e := u >> 52 & 0x7ff
-	if e == 0     do return FP_SUBNORMAL if (u << 1)  != 0 else FP_ZERO
-	if e == 0x7ff do return FP_NAN       if (u << 12) != 0 else FP_INFINITE
+	switch e := u >> 52 & 0x7ff; e {
+	case 0:     return FP_SUBNORMAL if (u << 1)  != 0 else FP_ZERO
+	case 0x7ff: return FP_NAN       if (u << 12) != 0 else FP_INFINITE
+	}
 	return FP_NORMAL
 }
 
 @(private)
 _fpclassifyf :: #force_inline proc(x: float) -> int {
 	u := transmute(uint32_t)x
-	e := u >> 23 & 0xff
-	if e == 0     do return FP_SUBNORMAL if (u << 1)  != 0 else FP_ZERO
-	if e == 0xff  do return FP_NAN       if (u << 9)  != 0 else FP_INFINITE
+	switch e := u >> 23 & 0xff; e {
+	case 0:    return FP_SUBNORMAL if (u << 1)  != 0 else FP_ZERO
+	case 0xff: return FP_NAN       if (u << 9)  != 0 else FP_INFINITE
+	}
 	return FP_NORMAL
 }
 
diff --git a/core/c/libc/stdatomic.odin b/core/c/libc/stdatomic.odin
index c79cde159..fbe1ef7ea 100644
--- a/core/c/libc/stdatomic.odin
+++ b/core/c/libc/stdatomic.odin
@@ -191,7 +191,7 @@ atomic_exchange_explicit :: #force_inline proc(object: ^$T, desired: T, order: m
 // 	[success = acq_rel, failure = relaxed] => acqrel_failrelaxed
 atomic_compare_exchange_strong :: #force_inline proc(object, expected: ^$T, desired: T) {
 	value, ok := intrinsics.atomic_cxchg(object, expected^, desired)
-	if !ok do expected^ = value
+	if !ok { expected^ = value } 
 	return ok
 }
 
@@ -236,13 +236,13 @@ atomic_compare_exchange_strong_explicit :: #force_inline proc(object, expected:
 		value, ok := intrinsics.atomic_cxchg_failacq(object, expected^, desired)
 
 	}
-	if !ok do expected^ = value
+	if !ok { expected^ = value }
 	return ok
 }
 
 atomic_compare_exchange_weak :: #force_inline proc(object, expected: ^$T, desired: T) {
 	value, ok := intrinsics.atomic_cxchgweak(object, expected^, desired)
-	if !ok do expected^ = value
+	if !ok { expected^ = value }
 	return ok
 }
 
@@ -287,7 +287,7 @@ atomic_compare_exchange_weak_explicit :: #force_inline proc(object, expected: ^$
 		value, ok := intrinsics.atomic_cxchgweak_failacq(object, expected^, desired)
 
 	}
-	if !ok do expected^ = value
+	if !ok { expected^ = value }
 	return ok
 }
 
diff --git a/core/container/priority_queue.odin b/core/container/priority_queue.odin
index e5bbe85c7..c54e964a6 100644
--- a/core/container/priority_queue.odin
+++ b/core/container/priority_queue.odin
@@ -71,13 +71,17 @@ priority_queue_push :: proc(q: ^$Q/Priority_Queue($T), item: T) {
 	i := q.len
 	for i > 0 {
 		p := (i - 1) / 2
-		if q.priority(s[p]) <= q.priority(item) do break
+		if q.priority(s[p]) <= q.priority(item) { 
+			break 
+		}
 		s[i] = s[p]
 		i = p
 	}
 
 	q.len += 1
-	if q.len > 0 do s[i] = item
+	if q.len > 0 { 
+		s[i] = item 
+	} 
 }
 
 
@@ -96,12 +100,16 @@ priority_queue_pop :: proc(q: ^$Q/Priority_Queue($T)) -> T {
 		b := i * 2 + 2
 		c := b < q.len && q.priority(s[b]) < q.priority(s[a]) ? b : a
 
-		if q.priority(s[c]) >= q.priority(root) do break
+		if q.priority(s[c]) >= q.priority(root) {
+			break
+		}
 		s[i] = s[c]
 		i = c
 	}
 
-	if q.len > 0 do s[i] = root
+	if q.len > 0 {
+		s[i] = root
+	}
 	return min
 }
 
diff --git a/core/odin/ast/clone.odin b/core/odin/ast/clone.odin
index e42c5c39e..143971a70 100644
--- a/core/odin/ast/clone.odin
+++ b/core/odin/ast/clone.odin
@@ -29,7 +29,7 @@ clone_array :: proc(array: $A/[]^$T) -> A {
 	}
 	res := make(A, len(array))
 	for elem, i in array {
-		res[i] = auto_cast clone(elem)
+		res[i] = (^T)(clone(elem))
 	}
 	return res
 }
@@ -40,7 +40,7 @@ clone_dynamic_array :: proc(array: $A/[dynamic]^$T) -> A {
 	}
 	res := make(A, len(array))
 	for elem, i in array {
-		res[i] = auto_cast clone(elem)
+		res[i] = (^T)(clone(elem))
 	}
 	return res
 }
@@ -169,10 +169,10 @@ clone_node :: proc(node: ^Node) -> ^Node {
 		r.lhs = clone(r.lhs)
 		r.rhs = clone(r.rhs)
 	case Block_Stmt:
-		r.label = auto_cast clone(r.label)
+		r.label = clone(r.label)
 		r.stmts = clone(r.stmts)
 	case If_Stmt:
-		r.label     = auto_cast clone(r.label)
+		r.label     = clone(r.label)
 		r.init      = clone(r.init)
 		r.cond      = clone(r.cond)
 		r.body      = clone(r.body)
@@ -186,13 +186,13 @@ clone_node :: proc(node: ^Node) -> ^Node {
 	case Defer_Stmt:
 		r.stmt = clone(r.stmt)
 	case For_Stmt:
-		r.label = auto_cast clone(r.label)
+		r.label = clone(r.label)
 		r.init = clone(r.init)
 		r.cond = clone(r.cond)
 		r.post = clone(r.post)
 		r.body = clone(r.body)
 	case Range_Stmt:
-		r.label = auto_cast clone(r.label)
+		r.label = clone(r.label)
 		r.vals = clone(r.vals)
 		r.expr = clone(r.expr)
 		r.body = clone(r.body)
@@ -200,12 +200,12 @@ clone_node :: proc(node: ^Node) -> ^Node {
 		r.list = clone(r.list)
 		r.body = clone(r.body)
 	case Switch_Stmt:
-		r.label = auto_cast clone(r.label)
+		r.label = clone(r.label)
 		r.init = clone(r.init)
 		r.cond = clone(r.cond)
 		r.body = clone(r.body)
 	case Type_Switch_Stmt:
-		r.label = auto_cast clone(r.label)
+		r.label = clone(r.label)
 		r.tag  = clone(r.tag)
 		r.expr = clone(r.expr)
 		r.body = clone(r.body)
diff --git a/core/odin/parser/parser.odin b/core/odin/parser/parser.odin
index af81b9041..8aa49f847 100644
--- a/core/odin/parser/parser.odin
+++ b/core/odin/parser/parser.odin
@@ -414,7 +414,7 @@ expect_closing_brace_of_field_list :: proc(p: ^Parser) -> tokenizer.Token {
 	}
 	if allow_token(p, .Semicolon) {
 		str := tokenizer.token_to_string(token)
-		error(p, end_of_line_pos(p, p.prev_tok), "expected a comma, got %s", p)
+		error(p, end_of_line_pos(p, p.prev_tok), "expected a comma, got %s", str)
 	}
 	return expect_token(p, .Close_Brace)
 }
diff --git a/core/odin/printer/printer.odin b/core/odin/printer/printer.odin
index 3dcb8f069..c3c003214 100644
--- a/core/odin/printer/printer.odin
+++ b/core/odin/printer/printer.odin
@@ -237,7 +237,7 @@ format_value_decl :: proc(p: ^Printer, index: int) {
 	align_next := false
 
 	//check to see if there is a binary operator in the last token(this is guaranteed by the ast visit), otherwise it's not multilined
-	for line, line_index in p.lines[eq_line:] {
+	for line in p.lines[eq_line:] {
 
 		if len(line.format_tokens) == 0 {
 			break
@@ -309,7 +309,7 @@ format_call :: proc(p: ^Printer, line_index: int, format_index: int) {
 	paren_count := 1
 	done        := false
 
-	for line, line_index in p.lines[paren_line:] {
+	for line in p.lines[paren_line:] {
 
 		if len(line.format_tokens) == 0 {
 			continue
@@ -374,7 +374,7 @@ format_keyword_to_brace :: proc(p: ^Printer, line_index: int, format_index: int,
 		panic("Should not be possible")
 	}
 
-	for line, line_index in p.lines[keyword_line:] {
+	for line, line_idx in p.lines[keyword_line:] {
 
 		if len(line.format_tokens) == 0 {
 			continue
@@ -388,7 +388,7 @@ format_keyword_to_brace :: proc(p: ^Printer, line_index: int, format_index: int,
 				return
 			}
 
-			if line_index == 0 && i <= format_index {
+			if line_idx == 0 && i <= format_index {
 				continue
 			}
 
@@ -403,7 +403,7 @@ format_keyword_to_brace :: proc(p: ^Printer, line_index: int, format_index: int,
 			}
 		}
 
-		if line_index != 0 {
+		if line_idx != 0 {
 			line.format_tokens[0].spaces_before = largest + 1
 		}
 
@@ -908,7 +908,7 @@ align_comments :: proc(p: ^Printer) {
 
 			length := 0
 
-			for format_token, i in l.format_tokens {
+			for format_token in l.format_tokens {
 				if format_token.kind == .Comment {
 					if len(l.format_tokens) == 1 {
 						l.format_tokens[i].spaces_before = info.length + 1
diff --git a/core/odin/printer/visit.odin b/core/odin/printer/visit.odin
index d9482e36f..c6e2d3542 100644
--- a/core/odin/printer/visit.odin
+++ b/core/odin/printer/visit.odin
@@ -499,7 +499,7 @@ visit_attributes :: proc(p: ^Printer, attributes: [dynamic]^ast.Attribute) {
 		return
 	}
 
-	for attribute, i in attributes {
+	for attribute in attributes {
 		move_line_limit(p, attribute.pos, 1)
 
 		push_generic_token(p, .At, 0)
@@ -1389,7 +1389,6 @@ visit_proc_type :: proc(p: ^Printer, proc_type: ast.Proc_Type, is_proc_lit := fa
 		push_generic_token(p, .Gt, 0)
 
 		use_parens := false
-		use_named  := false
 
 		if len(proc_type.results.list) > 1 {
 			use_parens = true
diff --git a/core/slice/slice.odin b/core/slice/slice.odin
index 0c266aa47..ba14854a0 100644
--- a/core/slice/slice.odin
+++ b/core/slice/slice.odin
@@ -135,9 +135,13 @@ has_suffix :: proc(array: $T/[]$E, needle: E) -> bool where intrinsics.type_is_c
 	return false
 }
 
-fill :: proc(array: $T/[]$E, value: E) {
-	for _, i in array {
-		array[i] = value
+fill :: proc(array: $T/[]$E, value: E) #no_bounds_check {
+	if len(array) <= 0 {
+		return
+	}
+	array[0] = value
+	for i := 1; i < len(array); i *= 2 {
+		copy(array[i:], array[:i])
 	}
 }
 
diff --git a/core/sys/win32/comdlg32.odin b/core/sys/win32/comdlg32.odin
index 7b4d06d80..4f74e8299 100644
--- a/core/sys/win32/comdlg32.odin
+++ b/core/sys/win32/comdlg32.odin
@@ -88,7 +88,9 @@ _open_file_dialog :: proc(title: string, dir: string,
 
 	// Filters need to be passed as a pair of strings (title, filter)
 	filter_len := u32(len(filters))
-	if filter_len % 2 != 0 do return "", false
+	if filter_len % 2 != 0 {
+		return "", false
+	}
 
 	filter: string
 	filter = strings.join(filters, "\u0000", context.temp_allocator)
diff --git a/core/sys/win32/general.odin b/core/sys/win32/general.odin
index 12e929b71..51f8c7d5f 100644
--- a/core/sys/win32/general.odin
+++ b/core/sys/win32/general.odin
@@ -837,7 +837,9 @@ wstring_to_utf8 :: proc(s: Wstring, N: int, allocator := context.temp_allocator)
 }
 
 utf16_to_utf8 :: proc(s: []u16, allocator := context.temp_allocator) -> string {
-	if len(s) == 0 do return ""
+	if len(s) == 0 {
+		return ""
+	}
 	return wstring_to_utf8(cast(Wstring)&s[0], len(s), allocator)
 }
 
diff --git a/vendor/OpenGL/wrappers.odin b/vendor/OpenGL/wrappers.odin
index e21bacc36..973b34d80 100644
--- a/vendor/OpenGL/wrappers.odin
+++ b/vendor/OpenGL/wrappers.odin
@@ -761,7 +761,7 @@ when !ODIN_DEBUG {
 		// There can be multiple errors, so we're required to continuously call glGetError until there are no more errors
 		for i := 0; /**/; i += 1 {
 			err := cast(Error_Enum)impl_GetError()
-			if err == .NO_ERROR do break
+			if err == .NO_ERROR { break }
 
 			fmt.printf("%d: glGetError() returned GL_%v\n", i, err)
 
@@ -770,7 +770,7 @@ when !ODIN_DEBUG {
 			{
 				// add input arguments
 				for arg, i in args[num_ret:] {
-				if i > 0 do fmt.printf(", ")
+				if i > 0 { fmt.printf(", ") }
 
 				if v, ok := arg.(u32); ok { // TODO: Assumes all u32 are GLenum (they're not, GLbitfield and GLuint are also mapped to u32), fix later by better typing
 					if err == .INVALID_ENUM {
@@ -789,7 +789,7 @@ when !ODIN_DEBUG {
 				} else if num_ret > 1 {
 					fmt.printf(") -> (")
 					for arg, i in args[1:num_ret] {
-						if i > 0 do fmt.printf(", ")
+						if i > 0 { fmt.printf(", ") }
 						fmt.printf("%v", arg)
 					}
 					fmt.printf(")\n")
diff --git a/vendor/glfw/bindings/bindings.odin b/vendor/glfw/bindings/bindings.odin
index df3a4ca02..e65e9b2fc 100644
--- a/vendor/glfw/bindings/bindings.odin
+++ b/vendor/glfw/bindings/bindings.odin
@@ -3,8 +3,15 @@ package glfw_bindings
 import "core:c"
 import vk "vendor:vulkan"
 
-when ODIN_OS == "linux"   do foreign import glfw "system:glfw" // TODO: Add the billion-or-so static libs to link to in linux
-when ODIN_OS == "windows" do foreign import glfw { "lib/glfw3.lib", "system:user32.lib", "system:gdi32.lib", "system:shell32.lib" }
+when ODIN_OS == "linux"   { foreign import glfw "system:glfw" } // TODO: Add the billion-or-so static libs to link to in linux
+when ODIN_OS == "windows" { 
+	foreign import glfw { 
+		"lib/glfw3.lib", 
+		"system:user32.lib", 
+		"system:gdi32.lib", 
+		"system:shell32.lib",
+	} 
+}
 
 #assert(size_of(c.int) == size_of(b32))
 
diff --git a/vendor/portmidi/portmidi.odin b/vendor/portmidi/portmidi.odin
index 13f282c83..05b33aeff 100644
--- a/vendor/portmidi/portmidi.odin
+++ b/vendor/portmidi/portmidi.odin
@@ -3,7 +3,7 @@ package portmidi
 import "core:c"
 import "core:strings"
 
-when ODIN_OS == "windows" do foreign import lib "portmidi.lib"
+when ODIN_OS == "windows" { foreign import lib "portmidi.lib" }
 
 #assert(size_of(b32) == size_of(c.int))
 
diff --git a/vendor/portmidi/util.odin b/vendor/portmidi/util.odin
index 8e2095383..d02142bd0 100644
--- a/vendor/portmidi/util.odin
+++ b/vendor/portmidi/util.odin
@@ -7,7 +7,7 @@ package portmidi
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "portmidi_s.lib"
+when ODIN_OS == "windows" { foreign import lib "portmidi_s.lib" }
 
 
 Queue :: distinct rawptr
diff --git a/vendor/raylib/raylib.odin b/vendor/raylib/raylib.odin
index 76eb61ebf..6893e1a6c 100644
--- a/vendor/raylib/raylib.odin
+++ b/vendor/raylib/raylib.odin
@@ -2,21 +2,24 @@ package raylib
 
 import c "core:c/libc"
 
-when #config(RAYLIB_USE_LINALG, false) {
+USE_LINALG :: #config(RAYLIB_USE_LINALG, true)
+when USE_LINALG {
 	import "core:math/linalg"	
 }
 
 #assert(size_of(rune) == size_of(c.int))
 
-when ODIN_OS == "windows" do foreign import lib {
-	"raylib.lib",
-	"system:Winmm.lib",
-	"system:Gdi32.lib",
-	"system:User32.lib",
-	"system:Shell32.lib",
+when ODIN_OS == "windows" {
+	foreign import lib {
+		"raylib.lib",
+		"system:Winmm.lib",
+		"system:Gdi32.lib",
+		"system:User32.lib",
+		"system:Shell32.lib",
+	}
 }
-when ODIN_OS == "linux"   do foreign import lib "linux/libraylib.a"
-when ODIN_OS == "darwin"  do foreign import lib "macos/libraylib.a"
+when ODIN_OS == "linux"  { foreign import lib "linux/libraylib.a" }
+when ODIN_OS == "darwin" { foreign import lib "macos/libraylib.a" }
 
 VERSION :: "3.7"
 
@@ -53,7 +56,7 @@ MAGENTA    :: Color{ 255, 0, 255, 255 }     // Magenta
 RAYWHITE   :: Color{ 245, 245, 245, 255 }   // My own White (raylib logo)
 
 
-when #config(RAYLIB_USE_LINALG, false) {
+when USE_LINALG {
 	// Vector2 type
 	Vector2 :: linalg.Vector2f32
 	// Vector3 type
diff --git a/vendor/raylib/rlgl.odin b/vendor/raylib/rlgl.odin
index fa0bbeeda..d94f9072a 100644
--- a/vendor/raylib/rlgl.odin
+++ b/vendor/raylib/rlgl.odin
@@ -2,15 +2,17 @@ package raylib
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib {
-	"raylib.lib",
-	"system:Winmm.lib",
-	"system:Gdi32.lib",
-	"system:User32.lib",
-	"system:Shell32.lib",
+when ODIN_OS == "windows" {
+	foreign import lib {
+		"raylib.lib",
+		"system:Winmm.lib",
+		"system:Gdi32.lib",
+		"system:User32.lib",
+		"system:Shell32.lib",
+	}
 }
-when ODIN_OS == "linux"   do foreign import lib "linux/libraylib.a"
-when ODIN_OS == "darwin"  do foreign import lib "macos/libraylib.a"
+when ODIN_OS == "linux"  { foreign import lib "linux/libraylib.a" }
+when ODIN_OS == "darwin" { foreign import lib "macos/libraylib.a" }
 
 GRAPHICS_API_OPENGL_11 :: false
 GRAPHICS_API_OPENGL_21 :: true
diff --git a/vendor/sdl2/image/sdl_image.odin b/vendor/sdl2/image/sdl_image.odin
index c93391033..1dbe048ed 100644
--- a/vendor/sdl2/image/sdl_image.odin
+++ b/vendor/sdl2/image/sdl_image.odin
@@ -3,10 +3,10 @@ package sdl2_image
 import "core:c"
 import SDL ".."
 
-when ODIN_OS == "windows" do foreign import lib "SDL2_image.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2_image"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2_image"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2_image"
+when ODIN_OS == "windows" { foreign import lib "SDL2_image.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2_image" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2_image" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2_image" }
 
 bool :: SDL.bool
 
diff --git a/vendor/sdl2/mixer/sdl_mixer.odin b/vendor/sdl2/mixer/sdl_mixer.odin
index f15f42f1e..ecb3f5a23 100644
--- a/vendor/sdl2/mixer/sdl_mixer.odin
+++ b/vendor/sdl2/mixer/sdl_mixer.odin
@@ -3,10 +3,10 @@ package sdl2_mixer
 import "core:c"
 import SDL ".."
 
-when ODIN_OS == "windows" do foreign import lib "SDL2_mixer.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2_mixer"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2_mixer"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2_mixer"
+when ODIN_OS == "windows" { foreign import lib "SDL2_mixer.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2_mixer" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2_mixer" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2_mixer" }
 
 
 MAJOR_VERSION :: 2
diff --git a/vendor/sdl2/net/sdl_net.odin b/vendor/sdl2/net/sdl_net.odin
index e6c43919b..49671764a 100644
--- a/vendor/sdl2/net/sdl_net.odin
+++ b/vendor/sdl2/net/sdl_net.odin
@@ -3,10 +3,10 @@ package sdl2_net
 import "core:c"
 import SDL ".."
 
-when ODIN_OS == "windows" do foreign import lib "SDL2_net.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2_net"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2_net"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2_net"
+when ODIN_OS == "windows" { foreign import lib "SDL2_net.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2_net" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2_net" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2_net" }
 
 bool :: SDL.bool
 
diff --git a/vendor/sdl2/sdl2.odin b/vendor/sdl2/sdl2.odin
index 84f1716b0..4781483f7 100644
--- a/vendor/sdl2/sdl2.odin
+++ b/vendor/sdl2/sdl2.odin
@@ -25,10 +25,10 @@ package sdl2
 import "core:c"
 import "core:intrinsics"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 version :: struct {
 	major: u8,        /**< major version */
diff --git a/vendor/sdl2/sdl_audio.odin b/vendor/sdl2/sdl_audio.odin
index 851038c45..e108e31c6 100644
--- a/vendor/sdl2/sdl_audio.odin
+++ b/vendor/sdl2/sdl_audio.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 /**
  *  \brief Audio format flags.
diff --git a/vendor/sdl2/sdl_blendmode.odin b/vendor/sdl2/sdl_blendmode.odin
index def50974e..3fb7c2e83 100644
--- a/vendor/sdl2/sdl_blendmode.odin
+++ b/vendor/sdl2/sdl_blendmode.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 /**
  *  \brief The blend mode used in SDL_RenderCopy() and drawing operations.
diff --git a/vendor/sdl2/sdl_cpuinfo.odin b/vendor/sdl2/sdl_cpuinfo.odin
index c1bcdac38..5fe5cf16c 100644
--- a/vendor/sdl2/sdl_cpuinfo.odin
+++ b/vendor/sdl2/sdl_cpuinfo.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 /* This is a guess for the cacheline size used for padding.
  * Most x86 processors have a 64 byte cache line.
diff --git a/vendor/sdl2/sdl_events.odin b/vendor/sdl2/sdl_events.odin
index 899265eff..535269656 100644
--- a/vendor/sdl2/sdl_events.odin
+++ b/vendor/sdl2/sdl_events.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 RELEASED :: 0
 PRESSED  :: 1
diff --git a/vendor/sdl2/sdl_gamecontroller.odin b/vendor/sdl2/sdl_gamecontroller.odin
index 377676d4b..747cd1af6 100644
--- a/vendor/sdl2/sdl_gamecontroller.odin
+++ b/vendor/sdl2/sdl_gamecontroller.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 GameController :: struct {}
 
diff --git a/vendor/sdl2/sdl_gesture_haptic.odin b/vendor/sdl2/sdl_gesture_haptic.odin
index 572233acf..0d257a525 100644
--- a/vendor/sdl2/sdl_gesture_haptic.odin
+++ b/vendor/sdl2/sdl_gesture_haptic.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 // Gesture
 
diff --git a/vendor/sdl2/sdl_hints.odin b/vendor/sdl2/sdl_hints.odin
index 0d563b582..b5793bb02 100644
--- a/vendor/sdl2/sdl_hints.odin
+++ b/vendor/sdl2/sdl_hints.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 HINT_ACCELEROMETER_AS_JOYSTICK                :: "SDL_ACCELEROMETER_AS_JOYSTICK"
 HINT_ALLOW_ALT_TAB_WHILE_GRABBED              :: "SDL_ALLOW_ALT_TAB_WHILE_GRABBED"
diff --git a/vendor/sdl2/sdl_joystick.odin b/vendor/sdl2/sdl_joystick.odin
index 80eb881a9..d2bb624b7 100644
--- a/vendor/sdl2/sdl_joystick.odin
+++ b/vendor/sdl2/sdl_joystick.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 Joystick :: struct {}
 
diff --git a/vendor/sdl2/sdl_keyboard.odin b/vendor/sdl2/sdl_keyboard.odin
index 85b200767..507b549cb 100644
--- a/vendor/sdl2/sdl_keyboard.odin
+++ b/vendor/sdl2/sdl_keyboard.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 Keysym :: struct {
 	scancode: Scancode, /**< SDL physical key code - see ::SDL_Scancode for details */
diff --git a/vendor/sdl2/sdl_log.odin b/vendor/sdl2/sdl_log.odin
index f49ffbea8..b9f8a8d7d 100644
--- a/vendor/sdl2/sdl_log.odin
+++ b/vendor/sdl2/sdl_log.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 MAX_LOG_MESSAGE :: 4096
 
diff --git a/vendor/sdl2/sdl_messagebox.odin b/vendor/sdl2/sdl_messagebox.odin
index 4ceac21b5..d8a07c1e2 100644
--- a/vendor/sdl2/sdl_messagebox.odin
+++ b/vendor/sdl2/sdl_messagebox.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 MessageBoxFlag :: enum u32 {
 	_ = 0,
diff --git a/vendor/sdl2/sdl_metal.odin b/vendor/sdl2/sdl_metal.odin
index 46f66b5c4..87a0313ef 100644
--- a/vendor/sdl2/sdl_metal.odin
+++ b/vendor/sdl2/sdl_metal.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 MetalView :: distinct rawptr
 
diff --git a/vendor/sdl2/sdl_mouse.odin b/vendor/sdl2/sdl_mouse.odin
index 3f31aedf9..d667addc8 100644
--- a/vendor/sdl2/sdl_mouse.odin
+++ b/vendor/sdl2/sdl_mouse.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 Cursor :: struct {}
 
diff --git a/vendor/sdl2/sdl_mutex.odin b/vendor/sdl2/sdl_mutex.odin
index 81c2c49cb..80d62f7c8 100644
--- a/vendor/sdl2/sdl_mutex.odin
+++ b/vendor/sdl2/sdl_mutex.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 MUTEX_TIMEDOUT :: 1
 MUTEX_MAXWAIT  :: ~u32(0)
diff --git a/vendor/sdl2/sdl_pixels.odin b/vendor/sdl2/sdl_pixels.odin
index c1569c56a..a8503c621 100644
--- a/vendor/sdl2/sdl_pixels.odin
+++ b/vendor/sdl2/sdl_pixels.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 ALPHA_OPAQUE      :: 255
 ALPHA_TRANSPARENT ::   0
diff --git a/vendor/sdl2/sdl_rect.odin b/vendor/sdl2/sdl_rect.odin
index 6f06d88ec..929897c26 100644
--- a/vendor/sdl2/sdl_rect.odin
+++ b/vendor/sdl2/sdl_rect.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 Point :: struct {
 	x: c.int,
diff --git a/vendor/sdl2/sdl_render.odin b/vendor/sdl2/sdl_render.odin
index 8e6c3c8d3..76dacf624 100644
--- a/vendor/sdl2/sdl_render.odin
+++ b/vendor/sdl2/sdl_render.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 RendererFlag :: enum u32 {
 	SOFTWARE      = 0, /**< The renderer is a software fallback */
diff --git a/vendor/sdl2/sdl_rwops.odin b/vendor/sdl2/sdl_rwops.odin
index 43ae42b51..590815c90 100644
--- a/vendor/sdl2/sdl_rwops.odin
+++ b/vendor/sdl2/sdl_rwops.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 /* RWops Types */
 RWOPS_UNKNOWN   :: 0 /**< Unknown stream type */
diff --git a/vendor/sdl2/sdl_stdinc.odin b/vendor/sdl2/sdl_stdinc.odin
index 074729fa5..bf098a591 100644
--- a/vendor/sdl2/sdl_stdinc.odin
+++ b/vendor/sdl2/sdl_stdinc.odin
@@ -5,10 +5,10 @@ import "core:intrinsics"
 import "core:runtime"
 _, _ :: intrinsics, runtime
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 bool :: distinct b32
 #assert(size_of(bool) == size_of(c.int))
diff --git a/vendor/sdl2/sdl_surface.odin b/vendor/sdl2/sdl_surface.odin
index 8efbb62cd..c0b20be63 100644
--- a/vendor/sdl2/sdl_surface.odin
+++ b/vendor/sdl2/sdl_surface.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 SWSURFACE       :: 0           /**< Just here for compatibility */
 PREALLOC        :: 0x00000001  /**< Surface uses preallocated memory */
diff --git a/vendor/sdl2/sdl_system.odin b/vendor/sdl2/sdl_system.odin
index 8d7bebdeb..31f1b590b 100644
--- a/vendor/sdl2/sdl_system.odin
+++ b/vendor/sdl2/sdl_system.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 // General
 @(default_calling_convention="c", link_prefix="SDL_")
diff --git a/vendor/sdl2/sdl_syswm.odin b/vendor/sdl2/sdl_syswm.odin
index 5402194c4..e374e72b7 100644
--- a/vendor/sdl2/sdl_syswm.odin
+++ b/vendor/sdl2/sdl_syswm.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 SYSWM_TYPE :: enum c.int {
 	UNKNOWN,
diff --git a/vendor/sdl2/sdl_thread.odin b/vendor/sdl2/sdl_thread.odin
index 4276296b5..cbaf3ac00 100644
--- a/vendor/sdl2/sdl_thread.odin
+++ b/vendor/sdl2/sdl_thread.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 Thread :: struct {}
 
diff --git a/vendor/sdl2/sdl_timer.odin b/vendor/sdl2/sdl_timer.odin
index a6d41214c..5b26c7346 100644
--- a/vendor/sdl2/sdl_timer.odin
+++ b/vendor/sdl2/sdl_timer.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 TimerCallback :: proc "c" (interval: u32, param: rawptr) -> u32
 TimerID :: distinct c.int
diff --git a/vendor/sdl2/sdl_touch.odin b/vendor/sdl2/sdl_touch.odin
index 1de4e1bb8..c393b74ef 100644
--- a/vendor/sdl2/sdl_touch.odin
+++ b/vendor/sdl2/sdl_touch.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 TouchID  :: distinct i64
 FingerID :: distinct i64
diff --git a/vendor/sdl2/sdl_video.odin b/vendor/sdl2/sdl_video.odin
index 9928a09bc..97a134739 100644
--- a/vendor/sdl2/sdl_video.odin
+++ b/vendor/sdl2/sdl_video.odin
@@ -2,10 +2,10 @@ package sdl2
 
 import "core:c"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 DisplayMode :: struct {
 	format:       u32,    /**< pixel format */
diff --git a/vendor/sdl2/sdl_vulkan.odin b/vendor/sdl2/sdl_vulkan.odin
index 00d17b33e..97a41bacf 100644
--- a/vendor/sdl2/sdl_vulkan.odin
+++ b/vendor/sdl2/sdl_vulkan.odin
@@ -3,10 +3,10 @@ package sdl2
 import "core:c"
 import vk "vendor:vulkan"
 
-when ODIN_OS == "windows" do foreign import lib "SDL2.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2"
+when ODIN_OS == "windows" { foreign import lib "SDL2.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
 
 VkInstance   :: vk.Instance
 VkSurfaceKHR :: vk.SurfaceKHR
diff --git a/vendor/sdl2/ttf/sdl_ttf.odin b/vendor/sdl2/ttf/sdl_ttf.odin
index 786593991..6b41f07c2 100644
--- a/vendor/sdl2/ttf/sdl_ttf.odin
+++ b/vendor/sdl2/ttf/sdl_ttf.odin
@@ -3,10 +3,10 @@ package sdl2_ttf
 import "core:c"
 import SDL ".."
 
-when ODIN_OS == "windows" do foreign import lib "SDL2_ttf.lib"
-when ODIN_OS == "linux"   do foreign import lib "system:SDL2_ttf"
-when ODIN_OS == "darwin"  do foreign import lib "system:SDL2_ttf"
-when ODIN_OS == "freebsd" do foreign import lib "system:SDL2_ttf"
+when ODIN_OS == "windows" { foreign import lib "SDL2_ttf.lib"    }
+when ODIN_OS == "linux"   { foreign import lib "system:SDL2_ttf" }
+when ODIN_OS == "darwin"  { foreign import lib "system:SDL2_ttf" }
+when ODIN_OS == "freebsd" { foreign import lib "system:SDL2_ttf" }
 
 bool :: SDL.bool