Browse Source

Simplify stb foreign imports

gingerBill 8 months ago
parent
commit
3d4a20918f

+ 2 - 6
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

+ 2 - 6
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"
 }
 
 //////////////////////////////////////////////////////////////////////////////

+ 2 - 6
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)