diff --git a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp index 221333413c..396cddeaf1 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp @@ -2,7 +2,7 @@ #include "Emu/Memory/Memory.h" #include "Emu/SysCalls/Modules.h" -// Defines STB_IMAGE_IMPLEMENTATION *once* before including stb_truetype.h (as said in stb_truetype.h's comments) +// Defines STB_TRUETYPE_IMPLEMENTATION *once* before including stb_truetype.h (as noted in stb_truetype.h's comments) #define STB_TRUETYPE_IMPLEMENTATION #include "stblib/stb_truetype.h" diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj index a6e8e0254c..982cdfe9d8 100644 --- a/rpcs3/emucore.vcxproj +++ b/rpcs3/emucore.vcxproj @@ -84,7 +84,6 @@ - diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters index 3da5f64a88..50df4d3a0b 100644 --- a/rpcs3/emucore.vcxproj.filters +++ b/rpcs3/emucore.vcxproj.filters @@ -1779,9 +1779,6 @@ Header Files - - Source Files - Emu\GPU\RSX\Common diff --git a/rpcs3/stb_image.cpp b/rpcs3/stb_image.cpp index 404192759a..1d425d85f8 100644 --- a/rpcs3/stb_image.cpp +++ b/rpcs3/stb_image.cpp @@ -1,4 +1,4 @@ #include "stdafx.h" -// Defines STB_IMAGE_IMPLEMENTATION *once* before including stb_image.h (as said in stb_image.h's comments) +// Defines STB_IMAGE_IMPLEMENTATION *once* for stb_image.h includes (Should this be placed somewhere else?) #define STB_IMAGE_IMPLEMENTATION -#include "stblib/stb_image.h" \ No newline at end of file +#include "stblib/stb_image.h" diff --git a/stblib/stb_truetype.h b/stblib/stb_truetype.h index 5c90536ecb..4a561cacb7 100644 --- a/stblib/stb_truetype.h +++ b/stblib/stb_truetype.h @@ -408,7 +408,9 @@ typedef char stbtt__check_size16[sizeof(stbtt_int16) == 2 ? 1 : -1]; // #define your own functions "STBTT_malloc" / "STBTT_free" to avoid malloc.h #ifndef STBTT_malloc +#ifndef __APPLE__ #include +#endif #define STBTT_malloc(x,u) ((void)(u),malloc(x)) #define STBTT_free(x,u) ((void)(u),free(x)) #endif