浏览代码

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.
Rémi Verschelde 8 年之前
父节点
当前提交
4965ddfaa1
共有 2 个文件被更改,包括 0 次插入2 次删除
  1. 0 1
      platform/server/detect.py
  2. 0 1
      platform/x11/detect.py

+ 0 - 1
platform/server/detect.py

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

+ 0 - 1
platform/x11/detect.py

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