aboutsummaryrefslogtreecommitdiff
path: root/platform/server/detect.py
diff options
context:
space:
mode:
authorRémi Verschelde2016-11-19 13:38:46 +0100
committerRémi Verschelde2016-11-19 13:40:53 +0100
commit326978dcce2068f373d7c60540b3d7c5fa402303 (patch)
tree26c5f76966414dfe95c36e591c13df7996eed39e /platform/server/detect.py
parent76233a3022f8b2de7e3c8001ef37b0f50b454408 (diff)
downloadgodot-326978dcce2068f373d7c60540b3d7c5fa402303.tar.gz
godot-326978dcce2068f373d7c60540b3d7c5fa402303.tar.zst
godot-326978dcce2068f373d7c60540b3d7c5fa402303.zip
Revert "libpng: Fix erroneously linking against libpng12 on old distros"
This reverts commits 5fa1bb331ad9be31dbfc752c7d19ccf7caeb8fa and ec4be71fade1ee5c6171e323d09197f3bf528499. 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 c32766a482595256bc48155587a47f27848ac8ea)
Diffstat (limited to 'platform/server/detect.py')
-rw-r--r--platform/server/detect.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/server/detect.py b/platform/server/detect.py
index 978b474f2..caad6d738 100644
--- a/platform/server/detect.py
+++ b/platform/server/detect.py
@@ -80,7 +80,7 @@ def configure(env):
env.ParseConfig('pkg-config freetype2 --cflags --libs')
if (env['builtin_libpng'] == 'no'):
- env.ParseConfig('pkg-config libpng16 --cflags --libs')
+ env.ParseConfig('pkg-config libpng --cflags --libs')
# Sound and video libraries
# Keep the order as it triggers chained dependencies (ogg needed by others, etc.)