浏览代码

stb_image

phillvancejr 3 年之前
父节点
当前提交
8f600798ef
共有 4 个文件被更改,包括 5 次插入2 次删除
  1. 1 1
      Makefile
  2. 1 0
      vendor/stb/image/stb_image.odin
  3. 2 1
      vendor/stb/image/stb_image_resize.odin
  4. 1 0
      vendor/stb/image/stb_image_write.odin

+ 1 - 1
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 = )|(

+ 1 - 0
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))
 

+ 2 - 1
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 ---
 	
-}
+}

+ 1 - 0
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)