aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaytan Laats <laytanlaats@hotmail.com>2024-09-29 13:35:11 +0200
committerlaytan <laytanlaats@hotmail.com>2024-09-29 11:45:57 +0200
commit152479052e75419df943422beccd3904f080e891 (patch)
tree267c311c3c9dec48bbe1f2d10fc438c43450278c
parentdaa3bb9a3beb8a4551ef4c8bdeefcaaaf11ed30d (diff)
va_list fixes for raylib & stb sprintf
-rw-r--r--vendor/raylib/raylib.odin2
-rw-r--r--vendor/stb/lib/darwin/stb_sprintf.abin0 -> 47224 bytes
-rw-r--r--vendor/stb/lib/stb_sprintf.libbin0 -> 25212 bytes
-rw-r--r--vendor/stb/sprintf/stb_sprintf.odin2
-rw-r--r--vendor/stb/src/build.bat3
5 files changed, 4 insertions, 3 deletions
diff --git a/vendor/raylib/raylib.odin b/vendor/raylib/raylib.odin
index 8d26c8824..4c6e4fe78 100644
--- a/vendor/raylib/raylib.odin
+++ b/vendor/raylib/raylib.odin
@@ -861,7 +861,7 @@ NPatchLayout :: enum c.int {
// Callbacks to hook some internal functions
// WARNING: This callbacks are intended for advance users
-TraceLogCallback :: #type proc "c" (logLevel: TraceLogLevel, text: cstring, args: c.va_list) // Logging: Redirect trace log messages
+TraceLogCallback :: #type proc "c" (logLevel: TraceLogLevel, text: cstring, args: ^c.va_list) // Logging: Redirect trace log messages
LoadFileDataCallback :: #type proc "c"(fileName: cstring, dataSize: ^c.int) -> [^]u8 // FileIO: Load binary data
SaveFileDataCallback :: #type proc "c" (fileName: cstring, data: rawptr, dataSize: c.int) -> bool // FileIO: Save binary data
LoadFileTextCallback :: #type proc "c" (fileName: cstring) -> [^]u8 // FileIO: Load text data
diff --git a/vendor/stb/lib/darwin/stb_sprintf.a b/vendor/stb/lib/darwin/stb_sprintf.a
new file mode 100644
index 000000000..e364ee200
--- /dev/null
+++ b/vendor/stb/lib/darwin/stb_sprintf.a
Binary files differ
diff --git a/vendor/stb/lib/stb_sprintf.lib b/vendor/stb/lib/stb_sprintf.lib
new file mode 100644
index 000000000..35c2cecc9
--- /dev/null
+++ b/vendor/stb/lib/stb_sprintf.lib
Binary files differ
diff --git a/vendor/stb/sprintf/stb_sprintf.odin b/vendor/stb/sprintf/stb_sprintf.odin
index ec5036e45..88119abd1 100644
--- a/vendor/stb/sprintf/stb_sprintf.odin
+++ b/vendor/stb/sprintf/stb_sprintf.odin
@@ -29,7 +29,7 @@ when ODIN_ARCH == .wasm32 || ODIN_ARCH == .wasm64p32 {
foreign stbpf {
sprintf :: proc(buf: [^]byte, fmt: cstring, #c_vararg args: ..any) -> i32 ---
snprintf :: proc(buf: [^]byte, count: i32, fmt: cstring, #c_vararg args: ..any) -> i32 ---
- vsprintf :: proc(buf: [^]byte, fmt: cstring, va: c.va_list) -> i32 ---
+ vsprintf :: proc(buf: [^]byte, fmt: cstring, va: ^c.va_list) -> i32 ---
vsnprintf :: proc(buf: [^]byte, count: i32, fmt: cstring, va: ^c.va_list) -> i32 ---
vsprintfcb :: proc(callback: SPRINTFCB, user: rawptr, buf: [^]byte, fmt: cstring, va: ^c.va_list) -> i32 ---
}
diff --git a/vendor/stb/src/build.bat b/vendor/stb/src/build.bat
index 5fd0e1789..54a0d249f 100644
--- a/vendor/stb/src/build.bat
+++ b/vendor/stb/src/build.bat
@@ -2,12 +2,13 @@
if not exist "..\lib" mkdir ..\lib
-cl -nologo -MT -TC -O2 -c stb_image.c stb_image_write.c stb_image_resize.c stb_truetype.c stb_rect_pack.c stb_vorbis.c
+cl -nologo -MT -TC -O2 -c stb_image.c stb_image_write.c stb_image_resize.c stb_truetype.c stb_rect_pack.c stb_vorbis.c stb_sprintf.c
lib -nologo stb_image.obj -out:..\lib\stb_image.lib
lib -nologo stb_image_write.obj -out:..\lib\stb_image_write.lib
lib -nologo stb_image_resize.obj -out:..\lib\stb_image_resize.lib
lib -nologo stb_truetype.obj -out:..\lib\stb_truetype.lib
lib -nologo stb_rect_pack.obj -out:..\lib\stb_rect_pack.lib
lib -nologo stb_vorbis.obj -out:..\lib\stb_vorbis.lib
+lib -nologo stb_sprintf.obj -out:..\lib\stb_sprintf.lib
del *.obj