From a3582fa3cb11c785ecf61dd2b04656473864b27e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sat, 19 Nov 2016 14:09:01 +0100 Subject: [PATCH] png: Allow building shared freetype with bundled libpng This was the behaviour when building Godot 2.1, which allows to build against Ubuntu 12.04 and its freetype that links old libpng12, while still bundling libpng16. (cherry picked from commit 4965ddfaa1536fb179d4b156d1ecb8a72a3c565f) --- platform/server/detect.py | 1 - platform/x11/detect.py | 1 - 2 files changed, 2 deletions(-) diff --git a/platform/server/detect.py b/platform/server/detect.py index caad6d73833..d77e693c766 100644 --- a/platform/server/detect.py +++ b/platform/server/detect.py @@ -76,7 +76,6 @@ def configure(env): env.ParseConfig('pkg-config libwebp --cflags --libs') if (env['builtin_freetype'] == 'no'): - env['builtin_libpng'] = 'no' # Freetype links against libpng env.ParseConfig('pkg-config freetype2 --cflags --libs') if (env['builtin_libpng'] == 'no'): diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 675fea51790..95a965af9f7 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -140,7 +140,6 @@ def configure(env): env.ParseConfig('pkg-config libwebp --cflags --libs') if (env['builtin_freetype'] == 'no'): - env['builtin_libpng'] = 'no' # Freetype links against libpng env.ParseConfig('pkg-config freetype2 --cflags --libs') if (env['builtin_libpng'] == 'no'):