Skip to content

I
Irrlicht New
Commit 392eccbd authored by mercury233's avatar mercury233
Browse files
Options

fix Irrlicht change in pngstruct.h

parent 54f2ab10
Show whitespace changes
Inline Side-by-side
Showing with 472 additions and 464 deletions
source/Irrlicht/libpng/pngstruct.h
View file @ 392eccbd
...@@ -24,7 +24,15 @@ ...@@ -24,7 +24,15 @@
/* We must ensure that zlib uses 'const' in declarations. */ /* We must ensure that zlib uses 'const' in declarations. */
# define ZLIB_CONST # define ZLIB_CONST
#endif #endif
#include "zlib.h" /* Irrlicht change:
Avoid that build-in png uses a different zlib than the rest of Irrlicht.
*/
#include "IrrCompileConfig.h"
#ifndef _IRR_USE_NON_SYSTEM_ZLIB_
#include <zlib.h> // use system lib
#else
#include "../zlib/zlib.h"
#endif
#ifdef const #ifdef const
/* zlib.h sometimes #defines const to nothing, undo this. */ /* zlib.h sometimes #defines const to nothing, undo this. */
# undef const # undef const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment