Merge branch 'upstream-merge' into 'master'

Merge upstream SRB2 changes

See merge request KartKrew/Kart-Public!33
This commit is contained in:
Sryder 2019-01-20 17:15:02 -05:00
commit d28ab4df94

View file

@ -93,8 +93,10 @@ typedef off_t off64_t;
#ifdef PNG_WRITE_SUPPORTED #ifdef PNG_WRITE_SUPPORTED
#define USE_PNG // Only actually use PNG if write is supported. #define USE_PNG // Only actually use PNG if write is supported.
#if defined (PNG_WRITE_APNG_SUPPORTED) //|| !defined(PNG_STATIC) #if defined (PNG_WRITE_APNG_SUPPORTED) //|| !defined(PNG_STATIC)
#if (PNG_LIBPNG_VER_MAJOR) == 1 && (PNG_LIBPNG_VER_MINOR <= 4) // Supposedly, the current APNG code can't work on newer versions as is
#define USE_APNG #define USE_APNG
#endif #endif
#endif
// See hardware/hw_draw.c for a similar check to this one. // See hardware/hw_draw.c for a similar check to this one.
#endif #endif
#endif #endif