You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-18 14:21:41 +00:00
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.
(cherry picked from commit 5fef84a135)
This commit is contained in:
@@ -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')
|
||||
|
||||
Reference in New Issue
Block a user