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

libpng: Fix erroneously linking against libpng12 on old distros

Browse Source 
This bit us for 2.1.1 binaries built on Ubuntu 12.04 LTS where
libpng.pc apparently prioritizes libpng12.

(cherry picked from commit 5fa1bb331a)
This commit is contained in:
Rémi Verschelde 2016-11-19 12:59:26 +01:00
parent 3e2247ca53
commit 220bcbf7c0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 libpng --cflags --libs') env.ParseConfig('pkg-config libpng16 --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')