diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-11-19 14:09:01 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-11-19 14:09:01 +0100 |
| commit | 4965ddfaa1536fb179d4b156d1ecb8a72a3c565f (patch) | |
| tree | 93ed700bc3711c57adf2457079abee5ddc9e2a8a | |
| parent | c32766a482595256bc48155587a47f27848ac8ea (diff) | |
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.
| -rw-r--r-- | platform/server/detect.py | 1 | ||||
| -rw-r--r-- | platform/x11/detect.py | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/platform/server/detect.py b/platform/server/detect.py index 4d86ffd376..8bc85f342d 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 d8cd79297e..857b147e14 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'): |