mirror of
https://github.com/RPCS3/rpcs3.git
synced 2024-12-28 09:23:34 +00: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:
parent
454fbce4c6
commit
8cded28c45
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -1,9 +1,4 @@
|
||||
#include "stdafx.h"
|
||||
|
||||
extern "C"
|
||||
{
|
||||
#pragma warning(push, 0)
|
||||
// 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"
|
||||
#include "stblib/stb_image.c"
|
||||
#pragma warning(pop)
|
||||
}
|
||||
|
4401
stblib/stb_image.c
4401
stblib/stb_image.c
File diff suppressed because it is too large
Load Diff
6701
stblib/stb_image.h
6701
stblib/stb_image.h
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user