diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-10-09 23:36:17 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-10-15 11:50:39 +0200 |
| commit | 5fef84a1358310304cb1114924525ec4df794b49 (patch) | |
| tree | 0ccafa62380328af528d3f11fb144b4a3fd933f3 /platform | |
| parent | 17f06202b7d5e00b6bf250e03b0ca994ee5dd298 (diff) | |
png: Split library to thirdparty dir and allow unbundling
Uses the new structure agreed upon in #6157, but the thirdparty/ folder
does not behave following a logic similar to that of modules/ yet.
The png driver can't be moved to a module as discussed in #6157, as it's
required by core together with a few other ImageLoader implementations
(see drivers/register_driver_types.cpp:register_core_driver_types())
Dropped the possibility to disable PNG support, it's a core component
of Godot.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/x11/detect.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index ba232f6d4e..98774e8555 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -71,10 +71,10 @@ def get_flags(): ('builtin_zlib', 'no'), ('glew', 'yes'), ("openssl", "yes"), - ('freetype','yes'), #use system freetype - + ('freetype','yes'), # use system freetype + ('libpng', 'system'), #("theora","no"), - ] + ] @@ -143,6 +143,8 @@ def configure(env): if (env["openssl"]=="yes"): env.ParseConfig('pkg-config openssl --cflags --libs') + if (env["libpng"] == "system"): + env.ParseConfig('pkg-config libpng --cflags --libs') if (env["freetype"]=="yes"): env.ParseConfig('pkg-config freetype2 --cflags --libs') |