From 6f60edbded554036ddae5b985297a0d8f0b40d27 Mon Sep 17 00:00:00 2001 From: cutealien Date: Thu, 3 Aug 2023 01:11:01 +0000 Subject: [PATCH] Merging r6511 through r6515 from branch releases/1.8 to trunk 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 --- changes.txt | 5 +++++ source/Irrlicht/libpng/pngstruct.h | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/changes.txt b/changes.txt index 25045e18..dfcbf492 100644 --- a/changes.txt +++ b/changes.txt @@ -398,6 +398,11 @@ Changes in 1.9 (not yet released) -------------------------- Changes in 1.8.6 +- Fix compiling on OSX with case-sensitive filesystems: IrrFramework-Info.plist now always starting with upper-case. + Thanks @Ryan Schmidt for bug report and patch. +- Fix: The build-in libpng now uses same zlib headers as rest of Irrlicht. + This fixes OSX compiling (which didn't have zlib in include path and used system header for this one instead). + Thanks @Ryan Schmidt for bug report. - Backport parts of COpenGLCommon.h to ensure that COpenGLExtensionHandler, COpenGLShaderMaterialRenderer and COpenGLTexture all use identical GL extension settings - Backport removing register keywords (deprecated by c++17) - Backport bugfix from trunk to make CUserPointerAttribute::setString work on 64-bit systems. diff --git a/source/Irrlicht/libpng/pngstruct.h b/source/Irrlicht/libpng/pngstruct.h index a94de65b..00d82ab5 100644 --- a/source/Irrlicht/libpng/pngstruct.h +++ b/source/Irrlicht/libpng/pngstruct.h @@ -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 // use system lib +#else + #include "../zlib/zlib.h" +#endif + #ifdef const /* zlib.h sometimes #defines const to nothing, undo this. */ # undef const