From 3d4a20918f074af8a7d99f5fcd468f21ef8d3a45 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Fri, 10 Jan 2025 10:12:36 +0000 Subject: [PATCH] Simplify stb foreign imports --- vendor/stb/image/stb_image.odin | 8 ++------ vendor/stb/image/stb_image_resize.odin | 8 ++------ vendor/stb/image/stb_image_write.odin | 8 ++------ 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/vendor/stb/image/stb_image.odin b/vendor/stb/image/stb_image.odin index 0c2ad7d05..2bba9aa83 100644 --- a/vendor/stb/image/stb_image.odin +++ b/vendor/stb/image/stb_image.odin @@ -18,12 +18,8 @@ when LIB != "" { } } -when ODIN_ARCH == .wasm32 || ODIN_ARCH == .wasm64p32 { - foreign import stbi "../lib/stb_image_wasm.o" -} else when LIB != "" { - foreign import stbi { LIB } -} else { - foreign import stbi "system:stb_image" +foreign import stbi { + LIB when LIB != "" else "system:stb_image" } NO_STDIO :: ODIN_ARCH == .wasm32 || ODIN_ARCH == .wasm64p32 diff --git a/vendor/stb/image/stb_image_resize.odin b/vendor/stb/image/stb_image_resize.odin index 241a93eb0..d00b55b4f 100644 --- a/vendor/stb/image/stb_image_resize.odin +++ b/vendor/stb/image/stb_image_resize.odin @@ -18,12 +18,8 @@ when RESIZE_LIB != "" { } } -when ODIN_ARCH == .wasm32 || ODIN_ARCH == .wasm64p32 { - foreign import lib "../lib/stb_image_resize_wasm.o" -} else when RESIZE_LIB != "" { - foreign import lib { RESIZE_LIB } -} else { - foreign import lib "system:stb_image_resize" +foreign import stbi { + RESIZE_LIB when RESIZE_LIB != "" else "system:stb_image_resize" } ////////////////////////////////////////////////////////////////////////////// diff --git a/vendor/stb/image/stb_image_write.odin b/vendor/stb/image/stb_image_write.odin index e86fa2b95..6d4c2a2e8 100644 --- a/vendor/stb/image/stb_image_write.odin +++ b/vendor/stb/image/stb_image_write.odin @@ -18,12 +18,8 @@ when WRITE_LIB != "" { } } -when ODIN_ARCH == .wasm32 || ODIN_ARCH == .wasm64p32 { - foreign import stbiw "../lib/stb_image_write_wasm.o" -} else when WRITE_LIB != "" { - foreign import stbiw { WRITE_LIB } -} else { - foreign import stbiw "system:stb_image_write" +foreign import stbi { + WRITE_LIB when WRITE_LIB != "" else "system:stb_image_write" } write_func :: proc "c" (ctx: rawptr, data: rawptr, size: c.int)