Browse Source

Merge pull request #4324 from laytan/va-list-stb-sprintf-raylib-fixe

va_list fixes for raylib & stb sprintf
gingerBill 10 months ago
parent
commit
d6f6099419

+ 1 - 1
vendor/raylib/raylib.odin

@@ -861,7 +861,7 @@ NPatchLayout :: enum c.int {
 
 
 // Callbacks to hook some internal functions
 // Callbacks to hook some internal functions
 // WARNING: This callbacks are intended for advance users
 // 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
 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
 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
 LoadFileTextCallback :: #type proc "c" (fileName: cstring) -> [^]u8                                     // FileIO: Load text data

BIN
vendor/stb/lib/darwin/stb_sprintf.a


BIN
vendor/stb/lib/stb_sprintf.lib


+ 1 - 1
vendor/stb/sprintf/stb_sprintf.odin

@@ -29,7 +29,7 @@ when ODIN_ARCH == .wasm32 || ODIN_ARCH == .wasm64p32 {
 foreign stbpf {
 foreign stbpf {
 	sprintf    :: proc(buf: [^]byte, fmt: cstring, #c_vararg args: ..any) -> i32 ---
 	sprintf    :: proc(buf: [^]byte, fmt: cstring, #c_vararg args: ..any) -> i32 ---
 	snprintf   :: proc(buf: [^]byte, count: i32, 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 ---
 	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 ---
 	vsprintfcb :: proc(callback: SPRINTFCB, user: rawptr, buf: [^]byte, fmt: cstring, va: ^c.va_list) -> i32 ---
 }
 }

+ 2 - 1
vendor/stb/src/build.bat

@@ -2,12 +2,13 @@
 
 
 if not exist "..\lib" mkdir ..\lib
 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.obj -out:..\lib\stb_image.lib
 lib -nologo stb_image_write.obj -out:..\lib\stb_image_write.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_image_resize.obj -out:..\lib\stb_image_resize.lib
 lib -nologo stb_truetype.obj -out:..\lib\stb_truetype.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_rect_pack.obj -out:..\lib\stb_rect_pack.lib
 lib -nologo stb_vorbis.obj -out:..\lib\stb_vorbis.lib
 lib -nologo stb_vorbis.obj -out:..\lib\stb_vorbis.lib
+lib -nologo stb_sprintf.obj -out:..\lib\stb_sprintf.lib
 
 
 del *.obj
 del *.obj