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 /SConstruct | |
| 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 'SConstruct')
| -rw-r--r-- | SConstruct | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 730af41545..acc6c2e248 100644 --- a/SConstruct +++ b/SConstruct @@ -127,7 +127,7 @@ opts.Add('theora','Theora Video (yes/no)','yes') opts.Add('theoralib','Theora Video (yes/no)','no') opts.Add('freetype','Freetype support in editor','builtin') opts.Add('xml','XML Save/Load support (yes/no)','yes') -opts.Add('png','PNG Image loader support (yes/no)','yes') +opts.Add('libpng','libpng library for image loader support (system/builtin)','builtin') opts.Add('jpg','JPG Image loader support (yes/no)','yes') opts.Add('webp','WEBP Image loader support (yes/no)','yes') opts.Add('dds','DDS Texture loader support (yes/no)','yes') @@ -350,8 +350,6 @@ if selected_platform in platform_list: if (env['theoralib']=='yes'): env.Append(CPPFLAGS=['-DTHEORALIB_ENABLED']); - if (env['png']=='yes'): - env.Append(CPPFLAGS=['-DPNG_ENABLED']); if (env['dds']=='yes'): env.Append(CPPFLAGS=['-DDDS_ENABLED']); if (env['pvr']=='yes'): |