From d9fafa7000c5be9bb094438fdf4114c70ac2fc6b Mon Sep 17 00:00:00 2001 From: gingerBill Date: Wed, 17 Jan 2024 16:32:26 +0000 Subject: [PATCH] Have default `foreign import` system paths --- vendor/commonmark/cmark.odin | 2 ++ vendor/stb/image/stb_image.odin | 7 ++++--- vendor/stb/image/stb_image_resize.odin | 8 +++++--- vendor/stb/image/stb_image_write.odin | 7 ++++--- vendor/stb/rect_pack/stb_rect_pack.odin | 7 ++++--- vendor/stb/truetype/stb_truetype.odin | 7 ++++--- vendor/stb/vorbis/stb_vorbis.odin | 7 ++++--- 7 files changed, 27 insertions(+), 18 deletions(-) diff --git a/vendor/commonmark/cmark.odin b/vendor/commonmark/cmark.odin index d6801b53a..e1e983da8 100644 --- a/vendor/commonmark/cmark.odin +++ b/vendor/commonmark/cmark.odin @@ -25,6 +25,8 @@ when ODIN_OS == .Windows { foreign import lib "system:cmark" } else when ODIN_OS == .Darwin { foreign import lib "system:cmark" +} else { + foreign import lib "system:cmark" } Option :: enum c.int { diff --git a/vendor/stb/image/stb_image.odin b/vendor/stb/image/stb_image.odin index c1e31c7b2..c7caf801e 100644 --- a/vendor/stb/image/stb_image.odin +++ b/vendor/stb/image/stb_image.odin @@ -4,9 +4,10 @@ import c "core:c/libc" #assert(size_of(c.int) == size_of(b32)) -when ODIN_OS == .Windows { foreign import stbi "../lib/stb_image.lib" } -when ODIN_OS == .Linux { foreign import stbi "../lib/stb_image.a" } -when ODIN_OS == .Darwin { foreign import stbi "../lib/darwin/stb_image.a" } + when ODIN_OS == .Windows { foreign import stbi "../lib/stb_image.lib" } +else when ODIN_OS == .Linux { foreign import stbi "../lib/stb_image.a" } +else when ODIN_OS == .Darwin { foreign import stbi "../lib/darwin/stb_image.a" } +else { foreign import stbi "system:stb_image" } #assert(size_of(b32) == size_of(c.int)) diff --git a/vendor/stb/image/stb_image_resize.odin b/vendor/stb/image/stb_image_resize.odin index 509f79fb8..4c2a76a92 100644 --- a/vendor/stb/image/stb_image_resize.odin +++ b/vendor/stb/image/stb_image_resize.odin @@ -2,9 +2,11 @@ package stb_image import c "core:c/libc" -when ODIN_OS == .Windows { foreign import lib "../lib/stb_image_resize.lib" } -when ODIN_OS == .Linux { foreign import lib "../lib/stb_image_resize.a" } -when ODIN_OS == .Darwin { foreign import lib "../lib/darwin/stb_image_resize.a" } + when ODIN_OS == .Windows { foreign import lib "../lib/stb_image_resize.lib" } +else when ODIN_OS == .Linux { foreign import lib "../lib/stb_image_resize.a" } +else when ODIN_OS == .Darwin { foreign import lib "../lib/darwin/stb_image_resize.a" } +else { foreign import stbi "system:stb_image_resize" } + ////////////////////////////////////////////////////////////////////////////// // diff --git a/vendor/stb/image/stb_image_write.odin b/vendor/stb/image/stb_image_write.odin index f830050a8..dff820808 100644 --- a/vendor/stb/image/stb_image_write.odin +++ b/vendor/stb/image/stb_image_write.odin @@ -2,9 +2,10 @@ package stb_image import c "core:c/libc" -when ODIN_OS == .Windows { foreign import stbiw "../lib/stb_image_write.lib" } -when ODIN_OS == .Linux { foreign import stbiw "../lib/stb_image_write.a" } -when ODIN_OS == .Darwin { foreign import stbiw "../lib/darwin/stb_image_write.a" } + when ODIN_OS == .Windows { foreign import stbiw "../lib/stb_image_write.lib" } +else when ODIN_OS == .Linux { foreign import stbiw "../lib/stb_image_write.a" } +else when ODIN_OS == .Darwin { foreign import stbiw "../lib/darwin/stb_image_write.a" } +else { foreign import stbi "system:stb_image_write" } write_func :: proc "c" (ctx: rawptr, data: rawptr, size: c.int) diff --git a/vendor/stb/rect_pack/stb_rect_pack.odin b/vendor/stb/rect_pack/stb_rect_pack.odin index 8abb4710a..dd70e6d8f 100644 --- a/vendor/stb/rect_pack/stb_rect_pack.odin +++ b/vendor/stb/rect_pack/stb_rect_pack.odin @@ -4,9 +4,10 @@ import c "core:c/libc" #assert(size_of(b32) == size_of(c.int)) -when ODIN_OS == .Windows { foreign import lib "../lib/stb_rect_pack.lib" } -when ODIN_OS == .Linux { foreign import lib "../lib/stb_rect_pack.a" } -when ODIN_OS == .Darwin { foreign import lib "../lib/darwin/stb_rect_pack.a" } + when ODIN_OS == .Windows { foreign import lib "../lib/stb_rect_pack.lib" } +else when ODIN_OS == .Linux { foreign import lib "../lib/stb_rect_pack.a" } +else when ODIN_OS == .Darwin { foreign import lib "../lib/darwin/stb_rect_pack.a" } +else { foreign import lib "system:stb_rect_pack" } Coord :: distinct c.int _MAXVAL :: max(Coord) diff --git a/vendor/stb/truetype/stb_truetype.odin b/vendor/stb/truetype/stb_truetype.odin index 5b0022da2..1600041de 100644 --- a/vendor/stb/truetype/stb_truetype.odin +++ b/vendor/stb/truetype/stb_truetype.odin @@ -3,9 +3,10 @@ package stb_truetype import c "core:c" import stbrp "vendor:stb/rect_pack" -when ODIN_OS == .Windows { foreign import stbtt "../lib/stb_truetype.lib" } -when ODIN_OS == .Linux { foreign import stbtt "../lib/stb_truetype.a" } -when ODIN_OS == .Darwin { foreign import stbtt "../lib/darwin/stb_truetype.a" } + when ODIN_OS == .Windows { foreign import stbtt "../lib/stb_truetype.lib" } +else when ODIN_OS == .Linux { foreign import stbtt "../lib/stb_truetype.a" } +else when ODIN_OS == .Darwin { foreign import stbtt "../lib/darwin/stb_truetype.a" } +else { foreign import stbtt "system:stb_truetype" } /////////////////////////////////////////////////////////////////////////////// diff --git a/vendor/stb/vorbis/stb_vorbis.odin b/vendor/stb/vorbis/stb_vorbis.odin index 8804dda80..0c887a473 100644 --- a/vendor/stb/vorbis/stb_vorbis.odin +++ b/vendor/stb/vorbis/stb_vorbis.odin @@ -3,9 +3,10 @@ package stb_vorbis import c "core:c/libc" -when ODIN_OS == .Windows { foreign import lib "../lib/stb_vorbis.lib" } -when ODIN_OS == .Linux { foreign import lib "../lib/stb_vorbis.a" } -when ODIN_OS == .Darwin { foreign import lib "../lib/darwin/stb_vorbis.a" } + when ODIN_OS == .Windows { foreign import lib "../lib/stb_vorbis.lib" } +else when ODIN_OS == .Linux { foreign import lib "../lib/stb_vorbis.a" } +else when ODIN_OS == .Darwin { foreign import lib "../lib/darwin/stb_vorbis.a" } +else { foreign import lib "system:stb_vorbis" }