scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-28 10:35:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed build.

Browse source
This commit is contained in:
Branimir Karadzic 2014-11-23 21:41:53 -08:00
parent bb0a305333
commit 8ff44ece56
3 changed files with 49 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
3rdparty/stb/stb_image.c vendored
View file

@ -4127,7 +4127,7 @@ static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, i
static stbi_uc *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) static stbi_uc *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp)
{ {
stbi_uc *u = 0; stbi_uc *u = 0;
stbi__gif g={0}; stbi__gif g={};
u = stbi__gif_load_next(s, &g, comp, req_comp); u = stbi__gif_load_next(s, &g, comp, req_comp);
if (u == (void *) 1) u = 0; // end of animated gif marker if (u == (void *) 1) u = 0; // end of animated gif marker

3
scripts/makedisttex.lua
View file

@ -9,8 +9,7 @@ project "makedisttex"
includedirs { includedirs {
BX_DIR .. "include", BX_DIR .. "include",
BGFX_DIR .. "3rdparty/edtaa3", BGFX_DIR .. "3rdparty",
BGFX_DIR .. "3rdparty/stb_image",
} }
files { files {

6
tools/makedisttex.cpp
View file

@ -8,8 +8,10 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <edtaa3func.h> #include <edtaa3/edtaa3func.h>
#include <stb_image.c>
#define STB_IMAGE_IMPLEMENTATION
#include <stb/stb_image.c>
#define BX_NAMESPACE 1 #define BX_NAMESPACE 1
#include <bx/bx.h> #include <bx/bx.h>