Browse Source

Merge pull request #4223 from hstormo/bugfix

Remove stb_rect_pack implementation from stb_truetype (fix #4215)
Laytan 11 months ago
parent
commit
ce3f6b60d2

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


BIN
vendor/stb/lib/stb_truetype.lib


BIN
vendor/stb/lib/stb_truetype_wasm.o


+ 1 - 1
vendor/stb/src/Makefile

@@ -8,7 +8,7 @@ endif
 
 
 wasm:
 wasm:
 	mkdir -p ../lib
 	mkdir -p ../lib
-	clang -c -Os --target=wasm32 -nostdlib stb_truetype_wasm.c -o ../lib/stb_truetype_wasm.o
+	$(CC) -c -Os --target=wasm32 -nostdlib stb_truetype_wasm.c -o ../lib/stb_truetype_wasm.o
 
 
 unix:
 unix:
 	mkdir -p ../lib
 	mkdir -p ../lib

+ 0 - 3
vendor/stb/src/stb_truetype.c

@@ -1,5 +1,2 @@
-#define STB_RECT_PACK_IMPLEMENTATION
-#include "stb_rect_pack.h"
-
 #define STB_TRUETYPE_IMPLEMENTATION
 #define STB_TRUETYPE_IMPLEMENTATION
 #include "stb_truetype.h"
 #include "stb_truetype.h"