godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "libpng: Fix erroneously linking against libpng12 on old distros" 

This reverts commits 5fa1bb331a
and ec4be71fad.

Looks like Debian/Ubuntu are not even shipping libpng16 nowadays in their
stable releases, we'll have to go back to statically linking our own
libpng16 to wait for them to stop being 5 years behind everybody.

(cherry picked from commit c32766a482)
This commit is contained in:
Rémi Verschelde 2016-11-19 13:38:46 +01:00
parent 76233a3022
commit 326978dcce
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/server/detect.py
View File

@ -80,7 +80,7 @@ def configure(env):
env.ParseConfig('pkg-config freetype2 --cflags --libs') env.ParseConfig('pkg-config freetype2 --cflags --libs')
if (env['builtin_libpng'] == 'no'): if (env['builtin_libpng'] == 'no'):
env.ParseConfig('pkg-config libpng16 --cflags --libs') env.ParseConfig('pkg-config libpng --cflags --libs')
# Sound and video libraries # Sound and video libraries
# Keep the order as it triggers chained dependencies (ogg needed by others, etc.) # Keep the order as it triggers chained dependencies (ogg needed by others, etc.)

2
platform/x11/detect.py
View File

@ -144,7 +144,7 @@ def configure(env):
env.ParseConfig('pkg-config freetype2 --cflags --libs') env.ParseConfig('pkg-config freetype2 --cflags --libs')
if (env['builtin_libpng'] == 'no'): if (env['builtin_libpng'] == 'no'):
env.ParseConfig('pkg-config libpng16 --cflags --libs') env.ParseConfig('pkg-config libpng --cflags --libs')
if (env['builtin_squish'] == 'no' and env["tools"] == "yes"): if (env['builtin_squish'] == 'no' and env["tools"] == "yes"):
env.ParseConfig('pkg-config libsquish --cflags --libs') env.ParseConfig('pkg-config libsquish --cflags --libs')