diff options
| author | Laytan <laytanlaats@hotmail.com> | 2024-09-09 17:21:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-09 17:21:41 +0200 |
| commit | ce3f6b60d20a8cf23b6d5669cb9c390d13810366 (patch) | |
| tree | 6dbe17b11675db24025d5a5fc873cde4683e2285 | |
| parent | a25a9e6ebe58510cfac20e1187f41a01ec3ec2b2 (diff) | |
| parent | aa7590941858b16f849b2998596991a3d368d4e4 (diff) | |
Merge pull request #4223 from hstormo/bugfix
Remove stb_rect_pack implementation from stb_truetype (fix #4215)
| -rw-r--r-- | vendor/stb/lib/darwin/stb_truetype.a | bin | 159344 -> 138088 bytes | |||
| -rw-r--r-- | vendor/stb/lib/stb_truetype.lib | bin | 175530 -> 170652 bytes | |||
| -rw-r--r-- | vendor/stb/lib/stb_truetype_wasm.o | bin | 41425 -> 41425 bytes | |||
| -rw-r--r-- | vendor/stb/src/Makefile | 2 | ||||
| -rw-r--r-- | vendor/stb/src/stb_truetype.c | 3 |
5 files changed, 1 insertions, 4 deletions
diff --git a/vendor/stb/lib/darwin/stb_truetype.a b/vendor/stb/lib/darwin/stb_truetype.a Binary files differindex f871693d0..b55fbe5d3 100644 --- a/vendor/stb/lib/darwin/stb_truetype.a +++ b/vendor/stb/lib/darwin/stb_truetype.a diff --git a/vendor/stb/lib/stb_truetype.lib b/vendor/stb/lib/stb_truetype.lib Binary files differindex d4139c707..16ecf944d 100644 --- a/vendor/stb/lib/stb_truetype.lib +++ b/vendor/stb/lib/stb_truetype.lib diff --git a/vendor/stb/lib/stb_truetype_wasm.o b/vendor/stb/lib/stb_truetype_wasm.o Binary files differindex 15c4fa0d5..d3380e8a2 100644 --- a/vendor/stb/lib/stb_truetype_wasm.o +++ b/vendor/stb/lib/stb_truetype_wasm.o diff --git a/vendor/stb/src/Makefile b/vendor/stb/src/Makefile index 6123a95fa..b7217d528 100644 --- a/vendor/stb/src/Makefile +++ b/vendor/stb/src/Makefile @@ -8,7 +8,7 @@ endif wasm: 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: mkdir -p ../lib diff --git a/vendor/stb/src/stb_truetype.c b/vendor/stb/src/stb_truetype.c index e44c22c89..05c23f583 100644 --- a/vendor/stb/src/stb_truetype.c +++ b/vendor/stb/src/stb_truetype.c @@ -1,5 +1,2 @@ -#define STB_RECT_PACK_IMPLEMENTATION -#include "stb_rect_pack.h" - #define STB_TRUETYPE_IMPLEMENTATION #include "stb_truetype.h"
\ No newline at end of file |