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

png: Allow building shared freetype with bundled libpng 

This was the behaviour when building Godot 2.1, which allows to build against
Ubuntu 12.04 and its freetype that links old libpng12, while still bundling
libpng16.
This commit is contained in:
Rémi Verschelde 2016-11-19 14:09:01 +01:00
parent c32766a482
commit 4965ddfaa1
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platform/server/detect.py
View File

@ -76,7 +76,6 @@ def configure(env):
env.ParseConfig('pkg-config libwebp --cflags --libs') env.ParseConfig('pkg-config libwebp --cflags --libs')
if (env['builtin_freetype'] == 'no'): if (env['builtin_freetype'] == 'no'):
env['builtin_libpng'] = 'no' # Freetype links against libpng
env.ParseConfig('pkg-config freetype2 --cflags --libs') env.ParseConfig('pkg-config freetype2 --cflags --libs')
if (env['builtin_libpng'] == 'no'): if (env['builtin_libpng'] == 'no'):

1
platform/x11/detect.py
View File

@ -140,7 +140,6 @@ def configure(env):
env.ParseConfig('pkg-config libwebp --cflags --libs') env.ParseConfig('pkg-config libwebp --cflags --libs')
if (env['builtin_freetype'] == 'no'): if (env['builtin_freetype'] == 'no'):
env['builtin_libpng'] = 'no' # Freetype links against libpng
env.ParseConfig('pkg-config freetype2 --cflags --libs') env.ParseConfig('pkg-config freetype2 --cflags --libs')
if (env['builtin_libpng'] == 'no'): if (env['builtin_libpng'] == 'no'):