1
0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 18:53:28 +01:00

Updates stb_image from 1.33 to 2.10

Updates stb_image from 1.33 to 2.10 which deprecates stb_image.c and
uses only stb_image.h
This commit is contained in:
AnnieL 2016-03-15 19:30:23 +00:00
parent 454fbce4c6
commit 8cded28c45
5 changed files with 6549 additions and 4590 deletions

View File

@ -4,10 +4,8 @@
#include "Emu/IdManager.h"
#include "Emu/SysCalls/Modules.h"
extern "C"
{
// STB_IMAGE_IMPLEMENTATION is already defined in stb_image.cpp
#include "stblib/stb_image.h"
}
#include "Emu/FS/VFS.h"
#include "Emu/FS/vfsFileBase.h"

View File

@ -4,10 +4,8 @@
#include "Emu/IdManager.h"
#include "Emu/SysCalls/Modules.h"
extern "C"
{
// STB_IMAGE_IMPLEMENTATION is already defined in stb_image.cpp
#include "stblib/stb_image.h"
}
#include "Emu/FS/VFS.h"
#include "Emu/FS/vfsFileBase.h"

View File

@ -1,9 +1,4 @@
#include "stdafx.h"
extern "C"
{
#pragma warning(push, 0)
#include "stblib/stb_image.h"
#include "stblib/stb_image.c"
#pragma warning(pop)
}
// Defines STB_IMAGE_IMPLEMENTATION *once* before including stb_image.h (as said in stb_image.h's comments)
#define STB_IMAGE_IMPLEMENTATION
#include "stblib/stb_image.h"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff