aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphillvancejr <phillipvancejr@gmail.com>2022-02-04 13:03:20 -0500
committerphillvancejr <phillipvancejr@gmail.com>2022-02-04 13:03:20 -0500
commit8f600798ef201ce3f34e29d7cdbf07b9bfc5db21 (patch)
tree31e56c24ce736a6c43c742d1772d3a0df3e943f5
parentf28c268d97c80f840777007262a0bd43b3086652 (diff)
stb_image
-rw-r--r--Makefile2
-rw-r--r--vendor/stb/image/stb_image.odin1
-rw-r--r--vendor/stb/image/stb_image_resize.odin3
-rw-r--r--vendor/stb/image/stb_image_write.odin1
4 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index d3d3c6a2d..df5fe0605 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ ifeq ($(OS), Darwin)
LLVM_VERSIONS = "13.%.%"
else
# allow for x86 / amd64 all llvm versions begining from 11
- LLVM_VERSIONS = "13.%.%" "12.0.1" "11.1.0"
+ LLVM_VERSIONS = "13.%.%" "12.0.1" "11.0.0"
endif
LLVM_VERSION_PATTERN_SEPERATOR = )|(
diff --git a/vendor/stb/image/stb_image.odin b/vendor/stb/image/stb_image.odin
index 9e72760ab..12f7aea9f 100644
--- a/vendor/stb/image/stb_image.odin
+++ b/vendor/stb/image/stb_image.odin
@@ -6,6 +6,7 @@ import c "core:c/libc"
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" }
#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 bee29a15e..c75a95fc9 100644
--- a/vendor/stb/image/stb_image_resize.odin
+++ b/vendor/stb/image/stb_image_resize.odin
@@ -4,6 +4,7 @@ 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" }
//////////////////////////////////////////////////////////////////////////////
//
@@ -184,4 +185,4 @@ foreign lib {
space: colorspace, alloc_context: rawptr,
s0, t0, s1, t1: f32) -> c.int ---
-} \ No newline at end of file
+}
diff --git a/vendor/stb/image/stb_image_write.odin b/vendor/stb/image/stb_image_write.odin
index 1f0cfce85..2a2ec240c 100644
--- a/vendor/stb/image/stb_image_write.odin
+++ b/vendor/stb/image/stb_image_write.odin
@@ -4,6 +4,7 @@ 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" }
write_func :: proc "c" (ctx: rawptr, data: rawptr, size: c.int)