minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-06-28 14:26:06 +02:00
Code Issues Projects Releases Wiki Activity

Merging r6511 through r6515 from branch releases/1.8 to trunk

Browse Source 
Note that 6514 couldn't be merged as the xcode project seems to have been rewritten and the irrFramework-Info.plist no longer exists in trunk.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6516 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2023-08-03 01:11:01 +00:00
parent 7ecaa18949
commit 6f60edbded
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/Irrlicht/libpng/pngstruct.h
View File

@ -27,7 +27,20 @@
/* We must ensure that zlib uses 'const' in declarations. */
# define ZLIB_CONST
#endif
#include "zlib.h"
/* Irrlicht change:
Avoid that build-in png uses a different zlib than the rest of Irrlicht.
Note: This also would allow removing zlib from the include paths, which
probably was done just to hide this bug. Anyway, it's less broken now
than it was and the rest is up to Irrlicht 1.9.
*/
#include "IrrCompileConfig.h"
#ifndef _IRR_USE_NON_SYSTEM_ZLIB_
#include <zlib.h> // use system lib
#else
#include "../zlib/zlib.h"
#endif
#ifdef const
/* zlib.h sometimes #defines const to nothing, undo this. */
# undef const