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:
@@ -4,10 +4,8 @@
|
|||||||
#include "Emu/IdManager.h"
|
#include "Emu/IdManager.h"
|
||||||
#include "Emu/SysCalls/Modules.h"
|
#include "Emu/SysCalls/Modules.h"
|
||||||
|
|
||||||
extern "C"
|
// STB_IMAGE_IMPLEMENTATION is already defined in stb_image.cpp
|
||||||
{
|
|
||||||
#include "stblib/stb_image.h"
|
#include "stblib/stb_image.h"
|
||||||
}
|
|
||||||
|
|
||||||
#include "Emu/FS/VFS.h"
|
#include "Emu/FS/VFS.h"
|
||||||
#include "Emu/FS/vfsFileBase.h"
|
#include "Emu/FS/vfsFileBase.h"
|
||||||
|
|||||||
@@ -4,10 +4,8 @@
|
|||||||
#include "Emu/IdManager.h"
|
#include "Emu/IdManager.h"
|
||||||
#include "Emu/SysCalls/Modules.h"
|
#include "Emu/SysCalls/Modules.h"
|
||||||
|
|
||||||
extern "C"
|
// STB_IMAGE_IMPLEMENTATION is already defined in stb_image.cpp
|
||||||
{
|
|
||||||
#include "stblib/stb_image.h"
|
#include "stblib/stb_image.h"
|
||||||
}
|
|
||||||
|
|
||||||
#include "Emu/FS/VFS.h"
|
#include "Emu/FS/VFS.h"
|
||||||
#include "Emu/FS/vfsFileBase.h"
|
#include "Emu/FS/vfsFileBase.h"
|
||||||
|
|||||||
+3
-8
@@ -1,9 +1,4 @@
|
|||||||
#include "stdafx.h"
|
#include "stdafx.h"
|
||||||
|
// Defines STB_IMAGE_IMPLEMENTATION *once* before including stb_image.h (as said in stb_image.h's comments)
|
||||||
extern "C"
|
#define STB_IMAGE_IMPLEMENTATION
|
||||||
{
|
#include "stblib/stb_image.h"
|
||||||
#pragma warning(push, 0)
|
|
||||||
#include "stblib/stb_image.h"
|
|
||||||
#include "stblib/stb_image.c"
|
|
||||||
#pragma warning(pop)
|
|
||||||
}
|
|
||||||
-4401
File diff suppressed because it is too large
Load Diff
+6544
-175
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user